From 99e2f91dfe575ced859b782053c3d7863f88a924 Mon Sep 17 00:00:00 2001
From: Lapo Calamandrei <calamandrei@gmail.com>
Date: Sat, 19 Mar 2016 17:23:39 +0100
Subject: [PATCH] Adwaita: simplify headerbar style

---
 gtk/theme/Adwaita/_common.scss           | 12 ++++--------
 gtk/theme/Adwaita/_drawing.scss          |  3 ++-
 gtk/theme/Adwaita/gtk-contained-dark.css | 10 ++++++----
 gtk/theme/Adwaita/gtk-contained.css      | 10 ++++++----
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index d7db690dc4..55ee61f642 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1296,8 +1296,6 @@ headerbar {
   border-color: $borders_color;
   border-radius: 0;
 
-  background-color: transparent;
-
   @include headerbar_fill;
 
   &:backdrop {
@@ -1327,14 +1325,12 @@ headerbar {
     color: $selected_fg_color;
     text-shadow: 0 -1px transparentize(black, 0.5);
     border-color: $selected_borders_color;
-    background-image: linear-gradient(to bottom,
-                                      lighten($selected_bg_color,5%),
-                                      $selected_bg_color);
-    box-shadow: inset 0 -1px mix($selected_borders_color, $selected_bg_color, 35%), //bottom shade
-                inset 0 1px $_hc;
+
+    @include headerbar_fill($selected_bg_color, $_hc);
 
     &:backdrop {
-      background-image: linear-gradient(to bottom, $selected_bg_color);
+      background-color: $selected_bg_color;
+      background-image: none;
       box-shadow: inset 0 1px mix($top_hilight, $selected_bg_color, 60%);
     }
 
diff --git a/gtk/theme/Adwaita/_drawing.scss b/gtk/theme/Adwaita/_drawing.scss
index 63f6adf5c1..aa1758b5ec 100644
--- a/gtk/theme/Adwaita/_drawing.scss
+++ b/gtk/theme/Adwaita/_drawing.scss
@@ -512,8 +512,9 @@
 
   @if $variant == 'light' { background-image: linear-gradient(to top, darken($c, 13%), darken($c, 2%) 2px, $c 3px); }
   @else { background-image: linear-gradient(to top, darken($c, 3%), darken($c, 1%) 2px, $c 3px); }
-  box-shadow: inset 0 1px $hc; // top highlight
 
+  background-color: $c;
+  box-shadow: inset 0 1px $hc; // top highlight
 }
 
 @mixin overshoot($p, $t:normal, $c:$fg_color) {
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index f082b9f0b3..f6f1224da1 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1448,8 +1448,8 @@ headerbar {
   border-style: solid;
   border-color: #1c1f1f;
   border-radius: 0;
-  background-color: transparent;
   background-image: linear-gradient(to top, #2a2f2f, #2f3434 2px, #323737 3px);
+  background-color: #323737;
   box-shadow: inset 0 1px rgba(238, 238, 236, 0.07); }
   .titlebar:backdrop:not(headerbar),
   headerbar:backdrop {
@@ -1472,11 +1472,13 @@ headerbar {
     color: #ffffff;
     text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
     border-color: #0f2b48;
-    background-image: linear-gradient(to bottom, #256ab1, #215d9c);
-    box-shadow: inset 0 -1px #1b4c7f, inset 0 1px rgba(40, 98, 159, 0.535); }
+    background-image: linear-gradient(to top, #1e5690, #205b98 2px, #215d9c 3px);
+    background-color: #215d9c;
+    box-shadow: inset 0 1px rgba(40, 98, 159, 0.535); }
     .selection-mode.titlebar:backdrop:not(headerbar),
     headerbar.selection-mode:backdrop {
-      background-image: linear-gradient(to bottom, #215d9c);
+      background-color: #215d9c;
+      background-image: none;
       box-shadow: inset 0 1px rgba(44, 100, 160, 0.442); }
     .selection-mode.titlebar:not(headerbar) button,
     headerbar.selection-mode button {
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 65f4dea810..b2a58c771a 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1454,8 +1454,8 @@ headerbar {
   border-style: solid;
   border-color: #9d9d99;
   border-radius: 0;
-  background-color: transparent;
   background-image: linear-gradient(to top, #d4d4d2, #efefef 2px, #f4f4f4 3px);
+  background-color: #f4f4f4;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.8); }
   .titlebar:backdrop:not(headerbar),
   headerbar:backdrop {
@@ -1478,11 +1478,13 @@ headerbar {
     color: #ffffff;
     text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
     border-color: #184472;
-    background-image: linear-gradient(to bottom, #5f9ddd, #4a90d9);
-    box-shadow: inset 0 -1px #3975b5, inset 0 1px rgba(146, 188, 232, 0.9); }
+    background-image: linear-gradient(to top, #276fba, #428bd7 2px, #4a90d9 3px);
+    background-color: #4a90d9;
+    box-shadow: inset 0 1px rgba(146, 188, 232, 0.9); }
     .selection-mode.titlebar:backdrop:not(headerbar),
     headerbar.selection-mode:backdrop {
-      background-image: linear-gradient(to bottom, #4a90d9);
+      background-color: #4a90d9;
+      background-image: none;
       box-shadow: inset 0 1px rgba(165, 200, 236, 0.88); }
     .selection-mode.titlebar:not(headerbar) button,
     headerbar.selection-mode button {
-- 
2.30.2